Merge tag 'upstream/0.5.0+svn5194_dfsg1'
authorReinhard Tartler <siretart@tauware.de>
Sun, 6 Apr 2014 15:35:59 +0000 (11:35 -0400)
committerReinhard Tartler <siretart@tauware.de>
Sun, 6 Apr 2014 15:35:59 +0000 (11:35 -0400)
commitc6d291482d8b4100fbc105ac72747c82cb70b402
tree39dd2daf827551ee0d9bdf41a0f384e25807904a
parentd6c5e681d61a06dc915bc8422d15c8234ce3f004
parentf8d0abd64ee3606d7927765cbb38c981fc6aa311
Merge tag 'upstream/0.5.0+svn5194_dfsg1'

Upstream version 0.5.0+svn5194~dfsg1